Update Controllers
Remove old methods