[DF-870] Small fix, remove unneeded code