cleanup, added configurations