Did header file clean up