Remove naughty if(true) conditional statement