Cleaning up gradle file and build settings