Remove unneeded controllers for now, tests still green