Revert "Added factory and tests."

This reverts commit 3199a371f5d558395bee4340af5e3c9ae3c29fc4.