Code clean-up following last file format changes.