Remove some unused parameters

Fixes 3 GCC -Wextra warnings

Also, -Wextra