We can actually remove this now the webdriver features are out