second attempt at commenting out current user calls.