Remove some cruft and add Vox support.