Fix for weird deletes. Also, just cleaner way of doing event management in general.