Some minor cleaning up [ci skip].
Fixed the issue with Travis CI.