[SD-1225] Remove reundant code