Removes unneccessary util class
Multiple refactorings and cleanups