Remove map validating