Finish cmake cleanup