Removed old, obsolete utils classes