Revert "Added some Smart Pointers"

This reverts commit bb658fca88e0e5e70d751f16711a76298f021186.