ECLEAR Lean up