Remove unused controllers
Remove warning in test