Removed premature util-class