Remove interface override here

They will be added in a separate bug
Test queue recovery with no-wait = true
Refactor