More cleanup to hopefully get travis working