Remove disabled (7/22)

Remove disabled