Remove dead code
Remove old comment
More tests