remove stackdump
refactor