Added "Lib::", goes with #1960.
Remove some dead code.