Remove dump-function in the codes