Housekeeping, removing unused header(s)