#JC-1293 refactoring. remove not desired