Removing unnecessary xpathing