Remove some circular references
ACL decoupling first part