Remove old architecture