net-tools update, old clean-ups