clean up jfltevzw and move Loki to jf-common