Cleanup, checkpoint for switch to view rendering