Cut more ACL related cruft from the codebase