Broken commit: Still clearing out the old event classes