#98 removal of var_dump and commented statements