Simplifying cleanup script
Fixing Travis CI configuration