Revert "MVC"

This reverts commit cdbde36a7f89bf91a69094133948e55961840f21.