Remove unused stuff from interface headers