More cleanup
Additiona cleanup