Clean up ACL configuration, move into adminhtml.xml