Numerous numerous cleanups