Clean up AndroidManifest