Get conditional branches (with comparisons) working.
Remove some unneeded stuff