As stated on the commit by @shafik, the previous patch left in some code from development. This removes it, as it is unreachable.
This file is getting quite large, so this patch splits the 'clause' specific parts off into its own file to keep them better organized.