Cleanup, working on speical opcodes