Removed a check which is not failing anymore and a conditional which I have no memory of why it existed