Moved BPF filter define to header file
Removed some commented out code