Remove most of the Controller magic.