Just a word of warning, we've noticed that following the upgrade to 11.40 the default feature list is modified and previously disabled options are then enabled. If you are disabling any features in this manner, please be aware that they will likely now be available to your customers and so you may want to check this.