More ACL cleanup