cleanup some work and ControFileData stuff