Split clearing into its own step.