Removed redundant close events