Merge "Track removal of a class."