BASIC-568 remove staff type grouping