Should delete the lines, rather than commenting out, if they are definitely moved.