Remove unused super calls