SFV-1337

Removed dead code.