Eliminate vestigal header file