Removed old architecture stuff