Moved few utilities to a static class.