Cleans up mapper