cleanup for mapping, comments