Unicode - simplify lib path

This reverts commit 43fdfe8f3c52f7d3d0f39c67eddccf49e29d72fe.
Unicode - cleanup double check