Improvements when removing nics