more cleanup in interfaces