Cleanup in configuration