Better user deletion logic