Remove common_engine dependency