SFV-1259

Removed some dead code.