Remove and rearrange

Remove some useless helper functions
Add new Utils class as extension and helper provider