Global data (hdm, hdt) moved to infrastructure.
Some global variables resolved, they were used only in a local context.