clean up nimoy
clean up map