Removed some old, unused utility classes