cleanup trap filter and makefile