Remove events which were removed by the refactor