Minor cleanup of old junk we don't need...