Removed done TODO
Removed -w ping option - not available on my OS