DF-1929. Remove unneeded code
DF-1930. Magic constant moved to the named constant, added comments