Cleanup / gradle changes
Cleanup
Merge branch 'feature_cleanup'
Optimized for Row-Perfect