Removed useless final modifiers