build.gradle cleaned up