More cleanup of various parts.