Revert "moved `remove_screen(self.screen_out)` to `_on_complete`"

This reverts commit 794b442b1b493385dd86391832e41b1bffb47138.