Properly handle result instead of unwrapping it.
Fix comparison criterion for delay removal.