Fixed redundant class objects.