VC++ compliant
Removing surplus.