togari: Clean up old cruft

Change-Id: I43f682b342d0f69c767562a87b88f005484df5c4