Only get back to auth screen when 401 is returned
clean code, comment and unused var removed
Update build