Class I oil traps with bypass