more billingly cleanup