lots of cleanup, allow heirarchies to become compound collisions