Clean up manifest

Change-Id: I944dfa3f03d8dde5190b2cc4c29475f77bba3e32