Removing unneeded imports, simplifying travis.yml