Improve performances
handlers: backport fix removing empty folder