BS-6819, remove useless declared bean
BS-7827, work service was not stopped when stopping node (merge issue)