Cleaned up function not to pass event