Clean up.
Adds less scaffold.