Some cleanup to make travis happy.