clean up and try to fix travis issue