more redesign clean ups