Removed final modifiers