Remove entire if-statement