more gradle cleanup