removed defunct EntityGrimoire* classes
added @Overrides