Bug 1106648 - Add new storage path to cleanup method