VariableRemover improvements