VC10 cleanup