Config Manager cleanup