More references to F1 removed