Fix migration issue and remove logging