updating config; cleanup