made some more cleanups of the previous nature.