Gradle build file cleanup