[Cleanup] Cleanup of VariableManager class.