Remove super calls