Clean up

We shouldn't have been setting g_usage, although I'm pretty sure it was
being ignored anyway.