Adapt firewall to reduce on remoteservices module
Remove ads on deprecated features
Remove ads on deprecated features