Remove unused class. Add location fixings