cleanups in create()