tb_reset fixes, more storage clean up