clean up mapping