more interface clean up