manifest: remove stuff we don't use

misc. cleanup also