Interface cleanups

Interface cleanups.