fix and clean up comment migration