removing heap check stuff