Add user_id to reports, cleanup