VS2005 delete & minor clean up