cleaning up mapping