Import authenticated_userid
Clean up