Added destructors to classes with maps to clean up "new" allocated objects