Solve #118 by removing reference to Factory.

closes #118