Removing extra references to modifier_cd