Merge "Remove dead code from LayerFE" into main