Removed shared pointers