Removed broken _remap function