cleanup and gradle build script