cleaning house and fixing a stupid build error

Change-Id: Ifd632d4db949cf4a0f9fbaa41d084e07843e7475