Cleanup a bunch of unnecessary stuff for Fx33