Replacing call to gerOrgDefaults in commented out text too, so it stops showing up in search results.
Replacing calls to getInstance with calls to the Facade.