Revert "All states implemented"

This reverts commit e2312796d65e636701e1e4e4ae099b37e9181789.