Some cleanups and smaller binaries!