some clean out bugs