Obsolete variables and constructions removed.