Remove weird conditional