Cleanups on existing ISC code, probably going to be ignored in favor of the new psse layer
Merge with Chris' changes