Clean up of old code.