Cleanups after merge with Chris and to switch IOException for PsseModelException