removed old outcommented code