We should remove these comments as they no longer apply.