Cleanup of the filtering and removed unused code

Small cleanup of hazardlib