Removed coman related dependencies