Tidy up manifest