Updates following CMS upgrade - removed vertigo includes