Clean up basic design