Cleanup state_manager after the mass db refactor + Maint command implementation
Cleanup state_manager after the mass db refactor + Maint command implementation