Removed leaking variables