Clean up build.gradle (apply current DRY principles)