remove more decidability requirements
3 files changed