Factored out use of Strategy.
Removed the Strategy interface...no longer needed.