cleanup and config changes for sanity