Remove needless elses