am a78b1255: Fix cleanup

* commit 'a78b1255ad1ce8dcacad21338d4f88db4231c4cd':
  Fix cleanup