commented out some unused and old definitions from the schema. please revise them.