Cleanup, remove check_login()