design cleanup