Update gradle
Fix taskdoubling
Some cleanup