Clean up remaps