Other changes that should be done with this change? as in some functions that can be stripped?