api cleanups