===> Cleaning for postgresql18-18.4