Merge "Remove unnecessary override"