Reduce FD usage

Change-Id: Ia0a7c5f98f4bbd44a5a14ad2bf7ec88e173f73ef
Signed-off-by: TanelDettenborn <tanel.dettenborn@intel.com>