Removing compute engine legacy code