Fix build and begin cleanup

Change-Id: Ibcaa99bc7c9dceea579276570a205068ebaf663c