clean up mapper
increment version