Cleaned up memory management.

Lots of deletes. Note: Problem detailed in commit "Did TONS of cleanup"
is still there.