Cleanup and add attended_on field to users