Make delete() faster