Cleanup for OpCodes