Some cleanup. User and events relationship is working