DF-1945. Remove unneeded code