KFSQA-628 - Fixed an issue with code cleanup