[Delivers #83960292] Cleanup deprecated invokesuper code.
Merge pull request #82 from teem2/cleanup

[Delivers #83960292] Cleanup deprecated invokesuper code.