Remove old classes
Simplify scene to draw entity lists