Re-Enabled cleanup on shutdown on Travis