removed old stuff (commented)