Clean up manifest

Change-Id: I79f8251998ffc30e46765b6bd474e77672b879c9