WIP: travis cleanup