diff --git a/lib/puppet/parser/e4_parser_adapter.rb b/lib/puppet/parser/e4_parser_adapter.rb
index d5e635339..e74903751 100644
--- a/lib/puppet/parser/e4_parser_adapter.rb
+++ b/lib/puppet/parser/e4_parser_adapter.rb
@@ -1,72 +1,72 @@
 require 'puppet/pops'
 
 module Puppet; module Parser; end; end;
 # Adapts an egrammar/eparser to respond to the public API of the classic parser
 # and makes use of the new evaluator.
 #
 class Puppet::Parser::E4ParserAdapter
 
   # Empty adapter fulfills watch_file contract without doing anything.
   # @api private
   class NullFileWatcher
     def watch_file(file)
       #nop
     end
   end
 
   # @param file_watcher [#watch_file] something that can watch a file
   def initialize(file_watcher = nil)
     @file_watcher = file_watcher || NullFileWatcher.new
     @file = ''
     @string = ''
     @use = :unspecified
     @@evaluating_parser ||= Puppet::Pops::Parser::EvaluatingParser.new()
   end
 
   def file=(file)
     @file = file
     @use = :file
     # watch if possible, but only if the file is something worth watching
     @file_watcher.watch_file(file) if !file.nil? && file != ''
   end
 
   def parse(string = nil)
     self.string= string if string
 
     parse_result =
     if @use == :string
       # Parse with a source_file to set in created AST objects (it was either given, or it may be unknown
       # if caller did not set a file and the present a string.
       #
       @@evaluating_parser.parse_string(@string, @file || "unknown-source-location")
     else
       @@evaluating_parser.parse_file(@file)
     end
 
     # the parse_result may be
     # * empty / nil (no input)
     # * a Model::Program
     # * a Model::Expression
     #
-    model = parse_result.nil? ? nil : parse_result.current 
+    model = parse_result.nil? ? nil : parse_result.current
     args = {}
     Puppet::Pops::Model::AstTransformer.new(@file).merge_location(args, model)
 
     ast_code =
     if model.is_a? Puppet::Pops::Model::Program
       Puppet::Parser::AST::PopsBridge::Program.new(model, args)
     else
       args[:value] = model
       Puppet::Parser::AST::PopsBridge::Expression.new(args)
     end
 
     # Create the "main" class for the content - this content will get merged with all other "main" content
     Puppet::Parser::AST::Hostclass.new('', :code => ast_code)
 
   end
 
   def string=(string)
     @string = string
     @use = :string
   end
 end
diff --git a/lib/puppet/parser/parser_factory.rb b/lib/puppet/parser/parser_factory.rb
index 4a1c7484d..9f4adce08 100644
--- a/lib/puppet/parser/parser_factory.rb
+++ b/lib/puppet/parser/parser_factory.rb
@@ -1,68 +1,60 @@
 module Puppet; end
 
 module Puppet::Parser
   # The ParserFactory makes selection of parser possible.
   # Currently, it is possible to switch between two different parsers:
   # * classic_parser, the parser in 3.1
   # * eparser, the Expression Based Parser
   #
   class ParserFactory
     # Produces a parser instance for the given environment
     def self.parser(environment)
       evaluating_parser(environment)
     end
 
-#    # Creates an instance of the classic parser.
-#    #
-#    def self.classic_parser(environment)
-#      # avoid expensive require if already loaded
-#      require 'puppet/parser' unless defined? Puppet::Parser::Parser
-#      Puppet::Parser::Parser.new(environment)
-#    end
-
     # Creates an instance of an E4ParserAdapter that adapts an
     # EvaluatingParser to the 3x way of parsing.
     #
     def self.evaluating_parser(file_watcher)
       # Since RGen is optional, test that it is installed
       assert_rgen_installed()
       unless defined?(Puppet::Pops::Parser::E4ParserAdapter)
         require 'puppet/parser/e4_parser_adapter'
         require 'puppet/pops/parser/code_merger'
       end
       E4ParserAdapter.new(file_watcher)
     end
 
     # Asserts that RGen >= 0.6.6 is installed by checking that certain behavior is available.
     # Note that this assert is expensive as it also requires puppet/pops (if not already loaded).
     #
     def self.assert_rgen_installed
       @@asserted ||= false
       return if @@asserted
       @@asserted = true
       begin
         require 'rgen/metamodel_builder'
       rescue LoadError
         raise Puppet::DevError.new("The gem 'rgen' version >= 0.7.0 is required when using the setting '--parser future'. Please install 'rgen'.")
       end
       # Since RGen is optional, there is nothing specifying its version.
       # It is not installed in any controlled way, so not possible to use gems to check (it may be installed some other way).
       # Instead check that "eContainer, and eContainingFeature" has been installed.
       require 'puppet/pops'
       begin
         litstring = Puppet::Pops::Model::LiteralString.new();
         container = Puppet::Pops::Model::ArithmeticExpression.new();
         container.left_expr = litstring
         raise "no eContainer" if litstring.eContainer() != container
         raise "no eContainingFeature" if litstring.eContainingFeature() != :left_expr
       rescue => e
         # TODO: RGen can raise exceptions for other reasons!
         raise Puppet::DevError.new("The gem 'rgen' version >= 0.7.0 is required when using '--parser future'. An older version is installed, please update.")
       end
     end
 
     def self.code_merger
         Puppet::Pops::Parser::CodeMerger.new
     end
   end
 end