CleanUp, remodeling to fit Gradle