369.15 cleanup before release