Reverting "instantiate classes for entry points"
Revert "instantiate classes for entry points"

This reverts commit d7a5e2159c15f39b0801f6a6a968da6a3b138371.