Clean up more dead code