Simplify the architecture.