some cms cleanup