Code cleanup.
Update Gradle wrapper to aersion 2.0.