More cleanup and simplification.