(Glitch64) Cleanups