Removing cms requirement