Correct Animal class

Got rid of map dependence (never used).