Removing unnecessary checks