removing empty handlers