Cleanup to run on travis