removed old code fragments