Remove disabled (9/22)

Remove disabled