Re-enabled cleanup & now raise CommandFailed.
Bump version to v0.0.37