Simplify interface.
Finish simplification.