Clean up; added new event repo call.