NXP-10952: Using the cleanUp method