Clean up and Gradle file update