manifest cleanup

Change-Id: I638742d479e65920b7a07638a201068ed1461f68