removed old stuff, update main