post move-to-cmake cleanup