Updated comments to match reality and removed references to things that
no longer exist.