Update to default template, removal of Selenium