Clean up some legacy.