Remove travis specific fixes, too much work