Bug #1185 fix - always cleanup