cleanups from kathy