Removing code to get around xpath not being implemented