removing unnecessary checks