clean up and gradleize