manifest cleanup

Change-Id: I7ded8e99f7f2a3140a0ec509d4af9b8aeba9f425