Removing dependency on xpath package