Clean up unwanted imports - fix-up AndroidMenifest