a little bit more clean up of dead code #435