get rid of assert usage