Logging removed, cleanup.