Make user deletion handled well
Reduce the db queries