Remove old architecture
Start again from scratch