Revert "Added basic support for a conditional (messy, but I needed a quick solution)"

Too messy

This reverts commit 23eb1719152ecf7b9117fff2d153b7291b43eded.