Please confirm this, and then clean up the comment and dead code