Cleanup, added configs.