Update gradle and clean up