yeah... more interface clean up