Merge unnecessary event listeners
Merge pull request #4 from Aeyoun/patch-2

Merge unnecessary event listeners