Some cleaning and try travis fix