clean up jfltespr tree
Merge "clean up jfltespr tree" into jb4.2