Cleaning up warnings in .h files

Extra semicolons and unused params