ENYO-2270: Cleaned-up some unused code

Enyo-DCO-1.1-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>