More cleanup of billing code.