build.gradle cleanup