Clean up and make nc requirement >=