Updated to latest JimLib and removed redundent code