removed all unnecessary shared pointer crap