Remove obsolete classes and merge utility classes