fix issues with server removal and run success/cancelling