I think commented code should be removed?