removed old code parts