Removing dump statements