removed old architecture