Clean ParType filtering code