Clean up access groups (bug 1025073)