Clean up and changes

Removed old code that will never be used in this.
Started setup for multiuser system.