Removed unused args
Removes event handlers upon dispose