more cleaning. Let me know if it doesn't compile; I might have to push my .vcxproj file