Remove a few annoying unreferenced variables