Remove unused code
Update gradle