Clean up of build.gradle