remove final imports.h and imports.c bits