IDEX-793 : Remove the final keyword