Fixed cleanup launches even if DEBUG=yes