removing non-working i.e. conditionals