Removed dependency on jsh