Removing unused code
Don't simplify APPA and CHOH
Don't simplify APPA or CHOH