Finish removing CMStats