Cleanups, configs