Merge add,addcsv and delete,declass commands.

Drop some unimplemented options.