fixed context/conact/substmt/stmt deletes