Removed more stuff from the manifest that gets placed there by merging instead at assemble time.