a bit o cleanup and see if we can get travis rolling