clean up; fixed: closed event