Cleaned up some build.gradle files