removed protractor and refactored