SIT-637
removal of redundant code