bug fix + migration-cleanup