Remove --waitsecs and add --wait for disable