Small fixes

(removes some dead code)