deleted some more old variables