LANG-848 removed duplicate code