Removing expect dependency