Remove travis hacks that are no longer needed