cleanups of old code that was broken.