Stdafx: more cleanup