Allow custom config, cleanup