cleanup... speed improvement... why?