Clean up comments and remove misleading numbering and references.
Clean up comments and remove misleading numbering and references.

fredrik-johansson/flint2,fredrik-johansson/flint2,wbhart/flint2,fredrik-johansson/flint2,wbhart/flint2,wbhart/flint2