Commented out schema-checking for production