needless check removed