more cleanup on external