Remove references to mapping