Get rid of some more unused vars