Remove if on delete scenario.
Fix tests.