more cleanups for the interface