Add option to remove data registers