Clean Up Event Model