Revert "restore kill-the-gm (will be in a separate branch)"

This reverts commit 40456e0d6b2e923b616336cdc97f972272e942d7.