Remove dependency on  command