Cleaned up manifests, removed unneeded params.