Various cleanups
Remove dead code, disable copying, don't allocate containers needlessly on the heap.