Remove \y and \r dependency from \F1 and \F2