more cleanup of bvi clocks