Removed some unnecessary classes, added post-expanded hook class.