Removed a lot of old junk and cleaned up.
Merge to amster.