Clean up state init functionality