[Fixup] To be squashed - change cleanup order

Signed-off-by: Regis Merlino <regis.merlino@intel.com>