Removed smart pointers