Remove unneeded CMS dependency & update keywords