more interface cleanup