ACF-55: HSA funcionality removed