Remove non-working controllers
Change connectivity database and queries