removed old commented useless stuff