remove some final modifiers again