LPS-35886 Remove the @Override annotation