Removed decision table, and other cruft