Making progress on CVV is unused

#438 again