Controllers inherit BaseController
Revert "Controllers inherit BaseController"

This reverts commit cd82ec292171367a3c2b8c4686aab1dfcac267e5.