Remove unneeded tracked classes, etc.