Design cleanup.