adding cleanup logic to avoid lingering event listeners

adding cleanup logic to avoid lingering event listeners #7