Gradle build cleanup

Let me know if you disagree with any of them, and I'll submit them separately