minor cleanups, deleted dead code, eliminated use of (==) on CoreType