removed old stuff premerge
new site