Clean up the dead code/comment