reorganize and remove unsupported options