more stdafx related cleanup