ContentCtrl cleanup