Initial interface cleanups.