closing feature #5518
- adjust resource bundle (global and specific message)
- clean unused code
- fixing error