Update header.
Remove commented out code where it is no longer needed.