miscellaneous state cleanup