Bye bye pointers, hello references. Removed unneeded deconstructors.