Removing commented out code and comments that are no longer true.