cleanup, logging, schema