configuration cleanups