Remove old remap fuction