further cleanup of the repo

Change-Id: Ic011a894e5eb7a39b7b3fd8c15c2b9862f14c9fd