These comments should be removed