Clean-up, hid not implemented options from help