Cleanup stale comments