some clean ups...