Revert "simpleFactory"

This reverts commit 81f726c8349f6b0429f3190054320e92f43f1169.