AS7-6387 Fix verify-running-server before remove handling

DO NOT MERGE WITHOUT OK FROM EMANUEL MUCKENHUBER.