Adding better clearing.