More cleanup, render controller in out-of-world situations