Gradle build scripts cleanup