unnecessary checks removed