clean up of interfaces
more clean up