additional comments and the removal of a class that was no longer
needed.