cleanup manifest

Change-Id: I185f61971f6dd79d877d0e1cba1134301b84dc19