Revert to using pomigrate2 + clean propeties files