Finished removing moncat_id