Remove unneeded utility classes.