Remove old code
newline eof
Remove dead code
newline eof
clean-up
Remove dead code and a warning