Remove old glue code.

Change-Id: Ic4a9c1f09d9bd4258d9766d546b0999b79997635
3 files changed