Stdafx: More cleanup