fixing duplicate cleanup call