Got rid of unused functions in header files.