[Upgrade]: Added new stage: Cleanup