Get rid of the extra tags classes

These are not needed anymore.