Remove stupid if conditions