Manifest feature cleanup