Simplify architecture.