Cleanup SQL output feature-state-mgt