Removing dependency on unix which