Revert "Add new object types factories and implementations"

This reverts commit 70e7ccdf9758bedf79a44051c053a437bdbbd82a.