removed old unused pars, structure update