finished more interface clean up