Revert "Add location to the MVC."

This reverts commit 5be044d8ebab743ddc359e5a1bf5e58313b1c083.