make sure we remove handler on destroy