More cleanup of code.