Remove magic rubbish, no time. Frame actions.

We'll probably rewrite out of C++ eventually anyway.