Remove cleanup of vars