ENYO-3934: Clean up cruft, more consolidation.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>