removed xpath calls