Remove old FIXME
Clean and Comment (Intersection Registration)