Some cleanup + protractor conf