More cleanup and simplification