Cleanup for travis build