Remove legacy comments