manifest: tidy up

Change-Id: Idd9531259c86cb97b716ba72413fb71ecaeb0410