comm2state() and statemodify() cleanup

return state is not used. will replace with exception if needed