* Remove references to old functions and methods * Use proper #ClassName.vmethod() decorator for vmethod