Remove final keyword and member initializers