AS7-6567: countdown the latch on any throwable
Add remove step handler for the common case of removing a single service