Adding schema, deleting crap