More cleanup and some less'ing