shared: cleanups

Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>