More cleanup
Added from notes