Trivial cleanup in operating system and crypto stuff.