Removed some more _id validation checks