All good ideas. Removing code is still the number one way to improve it. ...