Slowly cleaning stuff back up after all of the work to get multipass rendering working