Cleaned up build environment

Updated Gradle scripts