finish transitioning to using User table wherever possible