Class I oil and sand traps with bypass