Removed user_id