some util cleanup