Removed login/logout and stabalized