Remove unused class. Add location fixings
Merge branch 'master' into prod
Fix description for real... I hope
Merge branch 'master' into prod