removed old data structure