Remove some unjustified checks