Remove references to class.locale