interface cleanups