Answer to your question:
BOTH
especially since neither appear to be accountable and nobody knows what they are doing.  
Those agencies require a HUGE overhaul  with transparency.
Their scopes need to be well defined and reigned in.  
They both serve a purpose that has long been exceeded and they have become a domestic terror organization in essence thru the Executive office.  THAT has to stop immediately.
JMO