clean up acl
Merge pull request #897 from Singly/cleaner-acl

clean up acl
bit more acl cleanup