clean up some assertions