Code cleanup

Gradle plugin update.
Cleanup of unused resources, and code.