Removed login cruft #21