Gradle cleanup (todo: move to MainGradle)