Tidying up options and removing the saucelabs integration