Commit d4cf700e6f81e8749cb7526260550368314a1ecf

Con Kolivas 2014-04-03T11:18:02

Remove the --device and --remove-disabled options which don't work in a meaningful way any more