Remove calls to control_client (were breaking things) and made build 'catchall'.