Cleanup in MainActivity.java, AndroidManifest.xml and MainActivity.java