Yeah, I'd pull those things entirely. Just adds complexity and power consumption that you don't need.