Yes, this cleanup if fine.