cleanups in API