Remove old stuff and try to satisfy Travis