Utils Refactoring

Removal of deprecated utils