Remove a few more cases of unused code