KAZOO-3064 remove unused clauses