Scrapping the "Schema" crap