Add users handler
Remove unnecessary functions
Add in git push to deploy
Fix merge error