removing a couple of unused typedef warnings