Remove the old app classes
Some cleanup of rendering code