Final fixes to remove redundant code from travis config file