remove schema, fix tests, renames
simplify update data