Removed some more checks