Remove some unneeded type annotations