Remove disabled (8/22)

Remove disabled