Revert "Added classes to use abstract model framework."

This reverts commit 0eb75f8f16ecc4d4b5327e614cfa599a1790a48c.