Code cleanup. Use 'isDelete' instead of token match