Use smart pointers for easier handling.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@25830 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove the no longer present file since r25829 from the project file.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@25831 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac