Saturday night cleanup - still laggy