Remove obselete final modifiers