Removing Util class