Remove references to the unit setting