Removed unnecessary super calls