removed old irrelevant stuff