Remove vestiges of legacy ACB system
(cherry picked from commit 8a6d9d7f82e7a992d2c48910fb4bb847b28f3f45)
Remove vestiges of legacy ACB system
(cherry picked from commit 8a6d9d7f82e7a992d2c48910fb4bb847b28f3f45)