Minor cleanup to get just remapped events