Clean up + Bug fix + Gradle