More cleanup

;