Fix up more sources of unused code