Last few cleanup bits. 4.0 is ready
Cleaning up a few Lint things