Remove some overdesign.