Cleanup related to removal of common_engine