Remove disabled (6/22)

Remove disabled