Index: /issm/trunk-jpl/startup.m
===================================================================
--- /issm/trunk-jpl/startup.m	(revision 15749)
+++ /issm/trunk-jpl/startup.m	(revision 15750)
@@ -16,5 +16,4 @@
 else
 	ISSM_DIR=getenv('ISSM_DIR_WIN');
-	%ISSM_DIR='';
 end
 if (isempty(ISSM_DIR)),
@@ -27,7 +26,6 @@
 
 %ISSM path
-addpath([ISSM_DIR '/src/m/os/']); %loads recursivepath
-addpath([ISSM_DIR '/bin']);
-addpath([ISSM_DIR '/lib']);
+addpath([ISSM_DIR '/src/m/os/']); %load recursivepath
+addpath([ISSM_DIR '/lib']);       %load mex
 addpath(recursivepath([ISSM_DIR '/src/m']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/scotch']));
@@ -37,7 +35,5 @@
 addpath(recursivepath([ISSM_DIR '/externalpackages/googleearthtoolbox']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/howatmask']));
-addpath(recursivepath([ISSM_DIR '/externalpackages/cm_and_cb_utilities']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/dem']));
-
 clear ISSM_DIR;
 
@@ -50,23 +46,4 @@
 end
 
-%  deal with Matlab bug (on Linux, not WinXP) -- unless
-%  the class has been called, "empty" method can not be found
-if ~ispc,
-	normal_uncertain;
-	continuous_design;
-	continuous_state;
-	linear_inequality_constraint;
-	linear_equality_constraint;
-	response_function;
-	objective_function;
-	least_squares_term;
-	nonlinear_inequality_constraint;
-	nonlinear_equality_constraint;
-	clear ans;
-end
-
 %disable matlab bell!
 beep off;
-
-% no warning if we try to plot while in nojvm (will not be supported in future releases)
-warning off MATLAB:HandleGraphics:noJVM