Cleanup, new binary version.