MVC edits ~ IOD optimization.
Revert "MVC edits ~ IOD optimization."

This reverts commit 86a56ce55e59bdb66db0826eddf6937f3b4cdebd.