Remove some redundant code from shairplay CLI