Refactored away the selenium parts of the CLI