Block diagram cleanup.