clean up after implementing mapping