Clean up remap class