Initial cleanup to get running on Travis