Cleanup and gradle upgrade