General clean up of old code.