Remove FM routing patches

(merged into CM10)