removed cruft from Unit
removed cruft from Map and Cell