- removed references to __implements___ class etc.