Fix - Update to Gradle - Clean-Up