[#1491] some bug-fixes to corruption-cleanup, remove some unecessary
return-values on user route