More cleanup, removed some copy constructors, added some move ones