More cleanup to accomodate for the new schema validation