Revert "start work on complex condition"

This reverts commit 2513384d3f9b49869954f5e7dfe928f21a3afa89.