Removed useless code (Event)