Clean up the code before implementing the new design.