Removed tap.c and tap.h