Move controller functions to user controller
Remove unused controllers