More cleanup and simplifications