CMQ Engine Overhaul

Phase 1: Remove the engine