Delete handle option
Bug fixes