Merge "Remove useless method overriding"