Change in ovirt-engine[master]: core: removed unused code, improper hierarchy, duplicity