build.gradle tidy up, merged commands and re-enabled (although likely still not working)