Remove unnecessary checks