Don't perform handshake if already done.
Remove superfluous controller.