Remove unused. Switch rollback to BlockSate. Add deprecated annotations.