Better comment
Remove dead code