user_id changes

Removed handling via user_id and switched to referencing the User object
directly.