Tons of refactoring. Calling the Facade instead of aux methods in other classes. Removing those aux methods, or moving them into the Facade.