Why don't you allow terminal gates to be given back like normal gates? The gates can just disappear, an automated version of the current system.