removed test stuff
remove globals due to new ACL options