Concurency fix
deleted unwanted entity from database
delete unused function
fix not passed tests, and handle concurrncy issues on user site
small changes
Merge branch 'backend'