quick clean-up of manifest and java based on lint recommendations