build.gradle files cleanup