Given my comment and proposed workaround below, you'll be able to remove these classes completely.