Heavily simplify design and code.