Cleanups in DefaultClient