Deleted some junk
Cleaned up a bit and implemented step 3 (log-out)