fixed up tools for clearing data, schema changes