SFV-1370

Removed dead code.