Empty event creation fix
Removed deprecated code