More work on removing libgato.