further build.gradle cleanup