Cleanup in configuration properties