More code cleaning for travis