update: removed the irrelevant class instances