another seamingly good idea gone: more than one entity kind per exercise
kill more dead code