Solve design cleanup.