Cleanup of design.